diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index fc9d43f..245d36a 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -21,7 +21,6 @@
 | 1. Libraries
 | 2. Helper files
 | 3. Plugins
-| 4. Scripts
 | 5. Custom config files
 |
 */
@@ -67,21 +66,6 @@
 
 /*
 | -------------------------------------------------------------------
-|  Auto-load Scripts
-| -------------------------------------------------------------------
-| The term "scripts" refers to you own PHP scripts that you've 
-| placed in the application/scripts/ folder
-|
-| Prototype:
-|
-|	$autoload['script'] = array('my_script1', 'my_script2');
-*/
-
-$autoload['script'] = array();
-
-
-/*
-| -------------------------------------------------------------------
 |  Auto-load Config files
 | -------------------------------------------------------------------
 | Prototype:
diff --git a/system/application/config/database.php b/system/application/config/database.php
index 204ef68..5e64208 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -34,7 +34,7 @@
 $db['default']['hostname'] = "localhost";
 $db['default']['username'] = "root";
 $db['default']['password'] = "";
-$db['default']['database'] = "test";
+$db['default']['database'] = "tester";
 $db['default']['dbdriver'] = "mysql";
 $db['default']['dbprefix'] = "";
 $db['default']['active_r'] = TRUE;
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index b6c4eb7..d4f322d 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -222,7 +222,19 @@
 	 */
 	function escape_str($str)	
 	{	
-		return mysql_real_escape_string($str);
+		if (get_magic_quotes_gpc())
+		{
+			return $str;
+		}
+
+    	if (function_exists('mysql_escape_string'))
+    	{
+			return mysql_real_escape_string($str);
+		}
+		else
+		{
+        	return addslashes($str);
+    	}
 	}
 		
 	// --------------------------------------------------------------------
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index d6e9674..63df0fe 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -225,7 +225,19 @@
 	 */
 	function escape_str($str)	
 	{	
-		return mysqli_real_escape_string($this->conn_id, $str);
+		if (get_magic_quotes_gpc())
+		{
+			return $str;
+		}
+
+    	if (function_exists('mysql_escape_string'))
+    	{
+			return mysqli_real_escape_string($this->conn_id, $str);
+		}
+		else
+		{
+        	return addslashes($str);
+    	}
 	}
 		
 	// --------------------------------------------------------------------
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index d7740f5..34a2512 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -65,7 +65,9 @@
 	 */
 	function _set_route_mapping()
 	{		
-		// Are query strings enabled? If so we're done...
+		
+		// Are query strings enabled in the config file?
+		// If so, we're done since segment based URIs are not used with query strings.
 		if ($this->config->item('enable_query_strings') === TRUE AND isset($_GET[$this->config->item('controller_trigger')]))
 		{
 			$this->set_class($_GET[$this->config->item('controller_trigger')]);
@@ -78,15 +80,26 @@
 			return;
 		}
 		
-		// Load the routes.php file and set the default controller
+		// Load the routes.php file.
 		@include_once(APPPATH.'config/routes'.EXT);
 		$this->routes = ( ! isset($route) OR ! is_array($route)) ? array() : $route;
 		unset($route);
 
+		// Set the default controller so we can display it in the event
+		// the URI doesn't correlated to a valid controller.
 		$this->default_controller = ( ! isset($this->routes['default_controller']) OR $this->routes['default_controller'] == '') ? FALSE : strtolower($this->routes['default_controller']);		
 	
+		// Fetch the complete URI string
+		$this->uri_string = $this->_get_uri_string();
+		
+		// If the URI contains only a slash we'll kill it
+		if ($this->uri_string == '/')
+		{ 
+			$this->uri_string = '';
+		}
+	
 		// Is there a URI string? If not, the default controller specified in the "routes" file will be shown.
-		if (($this->uri_string = $this->_get_uri_string()) == '')
+		if ($this->uri_string == '')
 		{
 			if ($this->default_controller === FALSE)
 			{
@@ -107,6 +120,7 @@
 			$this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string);
 		}
 
+
 		// Explode the URI Segments. The individual segments will
 		// be stored in the $this->segments array.	
 		foreach(explode("/", preg_replace("|/*(.+?)/*$|", "\\1", $this->uri_string)) as $val)
diff --git a/user_guide/database/active_record.html b/user_guide/database/active_record.html
index b87f6f7..caa4c95 100644
--- a/user_guide/database/active_record.html
+++ b/user_guide/database/active_record.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/caching.html b/user_guide/database/caching.html
index 0c79702..c37b5bb 100644
--- a/user_guide/database/caching.html
+++ b/user_guide/database/caching.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/call_function.html b/user_guide/database/call_function.html
index a261dee..73dab3b 100644
--- a/user_guide/database/call_function.html
+++ b/user_guide/database/call_function.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/configuration.html b/user_guide/database/configuration.html
index f535724..2b16a3e 100644
--- a/user_guide/database/configuration.html
+++ b/user_guide/database/configuration.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/connecting.html b/user_guide/database/connecting.html
index 61b5128..e1f7715 100644
--- a/user_guide/database/connecting.html
+++ b/user_guide/database/connecting.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/examples.html b/user_guide/database/examples.html
index f1df8a7..24fc8fb 100644
--- a/user_guide/database/examples.html
+++ b/user_guide/database/examples.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/export.html b/user_guide/database/export.html
index 3672bcb..2f24d4a 100644
--- a/user_guide/database/export.html
+++ b/user_guide/database/export.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/fields.html b/user_guide/database/fields.html
index 2972427..be625ba 100644
--- a/user_guide/database/fields.html
+++ b/user_guide/database/fields.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/helpers.html b/user_guide/database/helpers.html
index 00d317a..b64107a 100644
--- a/user_guide/database/helpers.html
+++ b/user_guide/database/helpers.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/index.html b/user_guide/database/index.html
index 19d4165..fc06aca 100644
--- a/user_guide/database/index.html
+++ b/user_guide/database/index.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/queries.html b/user_guide/database/queries.html
index cee7c18..f0e094c 100644
--- a/user_guide/database/queries.html
+++ b/user_guide/database/queries.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/results.html b/user_guide/database/results.html
index 86b39b9..0600d01 100644
--- a/user_guide/database/results.html
+++ b/user_guide/database/results.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/table_data.html b/user_guide/database/table_data.html
index 20fa0cd..65b5d8b 100644
--- a/user_guide/database/table_data.html
+++ b/user_guide/database/table_data.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/transactions.html b/user_guide/database/transactions.html
index 071e942..3741a26 100644
--- a/user_guide/database/transactions.html
+++ b/user_guide/database/transactions.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/database/utilities.html b/user_guide/database/utilities.html
index 775c3f2..9f6d9f8 100644
--- a/user_guide/database/utilities.html
+++ b/user_guide/database/utilities.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html
index 99d5949..b8b60f0 100644
--- a/user_guide/general/alternative_php.html
+++ b/user_guide/general/alternative_php.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/ancillary_classes.html b/user_guide/general/ancillary_classes.html
index 0ff916b..b286de7 100644
--- a/user_guide/general/ancillary_classes.html
+++ b/user_guide/general/ancillary_classes.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/autoloader.html b/user_guide/general/autoloader.html
index fe98607..916d94b 100644
--- a/user_guide/general/autoloader.html
+++ b/user_guide/general/autoloader.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
@@ -72,7 +72,6 @@
 <li>Core classes found in the "libraries" folder</li>
 <li>Helper files found in the "helpers" folder</li>
 <li>Plugins found in the "plugins" folder</li>
-<li>Your own Scripts found in the "applications/scripts" folder</li>
 <li>Custom config files found in the "config" folder</li>
 </ul>
 
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html
index ef08010..ae14938 100644
--- a/user_guide/general/caching.html
+++ b/user_guide/general/caching.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html
index 6a7ff76..2c924d2 100644
--- a/user_guide/general/changelog.html
+++ b/user_guide/general/changelog.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
@@ -117,6 +117,7 @@
 <li>Updated the SQLite Driver to check for object support before attempting to return results as objects.  If unsupported it returns an array.</li>
 <li>Updated the Models loader function to allow multiple loads of the same model.</li>
 <li>Updated the MS SQL driver so that single quotes are escaped.</li>
+<li>Updated the Postgre and ODBC drivers for better compatibility.</li>
 <li>Removed a strtolower() call that was changing URL segments to lower case.</li>
 <li>Removed some references that were interfering with PHP 4.4.1 compatibility.</li>
 <li>Removed backticks from Postgre class since these are not needed.</li>
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index 5ee8676..6bfd060 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index bafd19f..ddaa8ad 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index 785848d..c8026d2 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/credits.html b/user_guide/general/credits.html
index 34c1dc1..4eb898d 100644
--- a/user_guide/general/credits.html
+++ b/user_guide/general/credits.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html
index 3fbc814..47568e9 100644
--- a/user_guide/general/errors.html
+++ b/user_guide/general/errors.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/helpers.html b/user_guide/general/helpers.html
index 44fa74b..6caf4a3 100644
--- a/user_guide/general/helpers.html
+++ b/user_guide/general/helpers.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html
index 09d41c0..db24e83 100644
--- a/user_guide/general/hooks.html
+++ b/user_guide/general/hooks.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
@@ -143,10 +143,10 @@
 Called immediately prior to any of your controllers being called. All base classes, routing, and security checks have been done.</li>
 
 <li><strong>post_controller_constructor</strong><br />
-Called immediately after the controller is instantiated, but prior to any method calls happen.</li>
+Called immediately after your controller is instantiated, but prior to any method calls happening.</li>
 
 <li><strong>post_controller</strong><br />
-Called immediately after the controller is called.</li>
+Called immediately after your controller is fully executed.</li>
 
 <li><strong>display_override</strong><br />
 Overrides the <dfn>_display()</dfn> function, used to send the finalized page to the web browser at the end of system execution.  This permits you to 
diff --git a/user_guide/general/index.html b/user_guide/general/index.html
index 854b736..cc692f6 100644
--- a/user_guide/general/index.html
+++ b/user_guide/general/index.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/libraries.html b/user_guide/general/libraries.html
index ebd2d6f..dbe7169 100644
--- a/user_guide/general/libraries.html
+++ b/user_guide/general/libraries.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
@@ -86,7 +86,7 @@
 
 <div id="footer">
 <p>
-Previous Topic:&nbsp;&nbsp;<a href="scripts.html">Scripts</a>
+Previous Topic:&nbsp;&nbsp;<a href="plugins.html">Plugins</a>
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index 292aac1..95e27e1 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/multiple_apps.html b/user_guide/general/multiple_apps.html
index 7fe1ae4..683a9c9 100644
--- a/user_guide/general/multiple_apps.html
+++ b/user_guide/general/multiple_apps.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
@@ -74,15 +74,15 @@
 system/application/<var>foo</var>/config/<br />
 system/application/<var>foo</var>/controllers/<br />
 system/application/<var>foo</var>/errors/<br />
+system/application/<var>foo</var>/libraries/<br />
 system/application/<var>foo</var>/models/<br />
-system/application/<var>foo</var>/scripts/<br />
 system/application/<var>foo</var>/views/<br />
 system/application/<samp>bar</samp>/<br />
 system/application/<samp>bar</samp>/config/<br />
 system/application/<samp>bar</samp>/controllers/<br />
 system/application/<samp>bar</samp>/errors/<br />
+system/application/<samp>bar</samp>/libraries/<br />
 system/application/<samp>bar</samp>/models/<br />
-system/application/<samp>bar</samp>/scripts/<br />
 system/application/<samp>bar</samp>/views/</code>
 
 
@@ -91,7 +91,7 @@
 
 <code>$application_folder = "foo";</code>
 
-
+<p>Note: Each of your applications will need its own <dfn>index.php</dfn> file (the index.php file can be named anything you want).</p>
 
 
 
diff --git a/user_guide/general/plugins.html b/user_guide/general/plugins.html
index b41ff9d..37283d5 100644
--- a/user_guide/general/plugins.html
+++ b/user_guide/general/plugins.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/quick_reference.html b/user_guide/general/quick_reference.html
index a5e3538..6eb222c 100644
--- a/user_guide/general/quick_reference.html
+++ b/user_guide/general/quick_reference.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/requirements.html b/user_guide/general/requirements.html
index 6480e90..0570ce4 100644
--- a/user_guide/general/requirements.html
+++ b/user_guide/general/requirements.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/routing.html b/user_guide/general/routing.html
index f3249ef..43bb014 100644
--- a/user_guide/general/routing.html
+++ b/user_guide/general/routing.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/scaffolding.html b/user_guide/general/scaffolding.html
index 388ddd3..82adcf0 100644
--- a/user_guide/general/scaffolding.html
+++ b/user_guide/general/scaffolding.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/security.html b/user_guide/general/security.html
index 7509a60..ae3d2f7 100644
--- a/user_guide/general/security.html
+++ b/user_guide/general/security.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/urls.html b/user_guide/general/urls.html
index c8a44ce..d15ac34 100644
--- a/user_guide/general/urls.html
+++ b/user_guide/general/urls.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/general/views.html b/user_guide/general/views.html
index 14b8767..063db86 100644
--- a/user_guide/general/views.html
+++ b/user_guide/general/views.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/array_helper.html b/user_guide/helpers/array_helper.html
index 14f80b5..2115508 100644
--- a/user_guide/helpers/array_helper.html
+++ b/user_guide/helpers/array_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/cookie_helper.html b/user_guide/helpers/cookie_helper.html
index 780e41f..ebe933e 100644
--- a/user_guide/helpers/cookie_helper.html
+++ b/user_guide/helpers/cookie_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/date_helper.html b/user_guide/helpers/date_helper.html
index 0d6eff9..e5ad08f 100644
--- a/user_guide/helpers/date_helper.html
+++ b/user_guide/helpers/date_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/directory_helper.html b/user_guide/helpers/directory_helper.html
index bddcf5f..b423066 100644
--- a/user_guide/helpers/directory_helper.html
+++ b/user_guide/helpers/directory_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/file_helper.html b/user_guide/helpers/file_helper.html
index ec9333c..73a30cc 100644
--- a/user_guide/helpers/file_helper.html
+++ b/user_guide/helpers/file_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/form_helper.html b/user_guide/helpers/form_helper.html
index d8e175d..5a9ea25 100644
--- a/user_guide/helpers/form_helper.html
+++ b/user_guide/helpers/form_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/html_helper.html b/user_guide/helpers/html_helper.html
index 43e1832..a38a03c 100644
--- a/user_guide/helpers/html_helper.html
+++ b/user_guide/helpers/html_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/index.html b/user_guide/helpers/index.html
index 90eec2c..d1fac14 100644
--- a/user_guide/helpers/index.html
+++ b/user_guide/helpers/index.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/inflector_helper.html b/user_guide/helpers/inflector_helper.html
index 210ac75..3d8d180 100644
--- a/user_guide/helpers/inflector_helper.html
+++ b/user_guide/helpers/inflector_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/security_helper.html b/user_guide/helpers/security_helper.html
index 894282e..c5e3a36 100644
--- a/user_guide/helpers/security_helper.html
+++ b/user_guide/helpers/security_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/string_helper.html b/user_guide/helpers/string_helper.html
index 176573c..8761d0d 100644
--- a/user_guide/helpers/string_helper.html
+++ b/user_guide/helpers/string_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/text_helper.html b/user_guide/helpers/text_helper.html
index 932bb48..261cf3e 100644
--- a/user_guide/helpers/text_helper.html
+++ b/user_guide/helpers/text_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/typography_helper.html b/user_guide/helpers/typography_helper.html
index 67e1b16..d1e67a7 100644
--- a/user_guide/helpers/typography_helper.html
+++ b/user_guide/helpers/typography_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/url_helper.html b/user_guide/helpers/url_helper.html
index 0e4f621..da1990c 100644
--- a/user_guide/helpers/url_helper.html
+++ b/user_guide/helpers/url_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/helpers/xml_helper.html b/user_guide/helpers/xml_helper.html
index 0c93613..9ca9eda 100644
--- a/user_guide/helpers/xml_helper.html
+++ b/user_guide/helpers/xml_helper.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/index.html b/user_guide/index.html
index 8f2a08a..a2887e4 100644
--- a/user_guide/index.html
+++ b/user_guide/index.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='userguide.css' />
 
-<script type="text/javascript" src="scripts/nav.js"></script>
+<script type="text/javascript" src="nav/nav.js"></script>
 <script type="text/javascript" src="scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="scripts/moo.fx.js"></script>
+<script type="text/javascript" src="nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/downloads.html b/user_guide/installation/downloads.html
index 0a4c450..c3397f9 100644
--- a/user_guide/installation/downloads.html
+++ b/user_guide/installation/downloads.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/index.html b/user_guide/installation/index.html
index e353d15..04cdbf3 100644
--- a/user_guide/installation/index.html
+++ b/user_guide/installation/index.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
@@ -80,20 +80,6 @@
 <p>If you're new to Code Igniter, please read the <a href="../general/index.html">Getting Started</a> section of the User Guide to begin learning how
 to build dynamic PHP applications. Enjoy!</p>
 
-<h2>Troubleshooting</h2>
-
-<p>If you find that no matter what you put in your URL only your default page is loading, it might be that your server 
-does not support the PATH_INFO variable needed to serve search-engine friendly URLs.  
-
-As a first step, open your <dfn>application/config/config.php</dfn> file and look for the <kbd>URI Protocol</kbd>
-information. It will recommend that you try a couple alternate settings.  If it still doesn't work after you've tried this you'll need
-to force Code Igniter to add a question mark to your URLs.  To do this open your <kbd>application/config/config.php</kbd> file and change this:</p>
-
-<code>$config['index_page'] = "index.php";</code>
-
-<p>To this:</p>
-
-<code>$config['index_page'] = "index.php?";</code>
 
 
 </div>
diff --git a/user_guide/installation/upgrade_120.html b/user_guide/installation/upgrade_120.html
index 602f0af..fbec4b8 100644
--- a/user_guide/installation/upgrade_120.html
+++ b/user_guide/installation/upgrade_120.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/upgrade_130.html b/user_guide/installation/upgrade_130.html
index 1f55cef..a382aee 100644
--- a/user_guide/installation/upgrade_130.html
+++ b/user_guide/installation/upgrade_130.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/upgrade_131.html b/user_guide/installation/upgrade_131.html
index de1556b..fe2e06e 100644
--- a/user_guide/installation/upgrade_131.html
+++ b/user_guide/installation/upgrade_131.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/upgrade_132.html b/user_guide/installation/upgrade_132.html
index cec43f2..b9584a7 100644
--- a/user_guide/installation/upgrade_132.html
+++ b/user_guide/installation/upgrade_132.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/upgrade_133.html b/user_guide/installation/upgrade_133.html
index 18368da..e843910 100644
--- a/user_guide/installation/upgrade_133.html
+++ b/user_guide/installation/upgrade_133.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html
index 28869d4..cdb478d 100644
--- a/user_guide/installation/upgrade_140.html
+++ b/user_guide/installation/upgrade_140.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/upgrade_141.html b/user_guide/installation/upgrade_141.html
index d4277f7..fc7b97a 100644
--- a/user_guide/installation/upgrade_141.html
+++ b/user_guide/installation/upgrade_141.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/upgrade_b11.html b/user_guide/installation/upgrade_b11.html
index 8d9e89f..c086372 100644
--- a/user_guide/installation/upgrade_b11.html
+++ b/user_guide/installation/upgrade_b11.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/installation/upgrading.html b/user_guide/installation/upgrading.html
index 3d183e2..6722c44 100644
--- a/user_guide/installation/upgrading.html
+++ b/user_guide/installation/upgrading.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
@@ -86,7 +86,7 @@
 &nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
 <a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-Next Topic:&nbsp;&nbsp;<a href="../overview/at_a_glance.html">Code Igniter at a Glance</a>
+Next Topic:&nbsp;&nbsp;<a href="troubleshooting.html">Troubleshooting</a>
 <p>
 
 <p><a href="http://www.codeigniter.com">Code Igniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 &nbsp;&middot;&nbsp; <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
diff --git a/user_guide/libraries/benchmark.html b/user_guide/libraries/benchmark.html
index 3c4e6af..c8cc021 100644
--- a/user_guide/libraries/benchmark.html
+++ b/user_guide/libraries/benchmark.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/calendar.html b/user_guide/libraries/calendar.html
index e122a40..485d402 100644
--- a/user_guide/libraries/calendar.html
+++ b/user_guide/libraries/calendar.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/config.html b/user_guide/libraries/config.html
index ea3285b..304d34c 100644
--- a/user_guide/libraries/config.html
+++ b/user_guide/libraries/config.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/email.html b/user_guide/libraries/email.html
index 464e566..b21d8bb 100644
--- a/user_guide/libraries/email.html
+++ b/user_guide/libraries/email.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html
index c6326db..d76da62 100644
--- a/user_guide/libraries/encryption.html
+++ b/user_guide/libraries/encryption.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/file_uploading.html b/user_guide/libraries/file_uploading.html
index 508e172..20ef46b 100644
--- a/user_guide/libraries/file_uploading.html
+++ b/user_guide/libraries/file_uploading.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/image_lib.html b/user_guide/libraries/image_lib.html
index 62f303a..c2549ad 100644
--- a/user_guide/libraries/image_lib.html
+++ b/user_guide/libraries/image_lib.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/input.html b/user_guide/libraries/input.html
index e461097..820bcc6 100644
--- a/user_guide/libraries/input.html
+++ b/user_guide/libraries/input.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/language.html b/user_guide/libraries/language.html
index 6067fe5..1693555 100644
--- a/user_guide/libraries/language.html
+++ b/user_guide/libraries/language.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/loader.html b/user_guide/libraries/loader.html
index a09b2d1..dbb4a5c 100644
--- a/user_guide/libraries/loader.html
+++ b/user_guide/libraries/loader.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/output.html b/user_guide/libraries/output.html
index 4f94db6..75f5b32 100644
--- a/user_guide/libraries/output.html
+++ b/user_guide/libraries/output.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/pagination.html b/user_guide/libraries/pagination.html
index f71027b..dfa137e 100644
--- a/user_guide/libraries/pagination.html
+++ b/user_guide/libraries/pagination.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/parser.html b/user_guide/libraries/parser.html
index 974ec3c..8b531ac 100644
--- a/user_guide/libraries/parser.html
+++ b/user_guide/libraries/parser.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html
index 45b8920..4979b50 100644
--- a/user_guide/libraries/sessions.html
+++ b/user_guide/libraries/sessions.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/trackback.html b/user_guide/libraries/trackback.html
index 5a903f2..28ee43e 100644
--- a/user_guide/libraries/trackback.html
+++ b/user_guide/libraries/trackback.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/unit_testing.html b/user_guide/libraries/unit_testing.html
index 429cd2f..4071ac1 100644
--- a/user_guide/libraries/unit_testing.html
+++ b/user_guide/libraries/unit_testing.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/uri.html b/user_guide/libraries/uri.html
index 789a1a0..d893b3f 100644
--- a/user_guide/libraries/uri.html
+++ b/user_guide/libraries/uri.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/validation.html b/user_guide/libraries/validation.html
index d0d3714..8aae0c3 100644
--- a/user_guide/libraries/validation.html
+++ b/user_guide/libraries/validation.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/libraries/xmlrpc.html b/user_guide/libraries/xmlrpc.html
index 96a52a1..94209e5 100644
--- a/user_guide/libraries/xmlrpc.html
+++ b/user_guide/libraries/xmlrpc.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/license.html b/user_guide/license.html
index 0fe09ec..8150140 100644
--- a/user_guide/license.html
+++ b/user_guide/license.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='userguide.css' />
 
-<script type="text/javascript" src="scripts/nav.js"></script>
+<script type="text/javascript" src="nav/nav.js"></script>
 <script type="text/javascript" src="scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="scripts/moo.fx.js"></script>
+<script type="text/javascript" src="nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/overview/appflow.html b/user_guide/overview/appflow.html
index e7f9192..4cc76ea 100644
--- a/user_guide/overview/appflow.html
+++ b/user_guide/overview/appflow.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/overview/at_a_glance.html b/user_guide/overview/at_a_glance.html
index 0cf0578..90935c9 100644
--- a/user_guide/overview/at_a_glance.html
+++ b/user_guide/overview/at_a_glance.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/overview/features.html b/user_guide/overview/features.html
index a9d482c..f546cb3 100644
--- a/user_guide/overview/features.html
+++ b/user_guide/overview/features.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/overview/goals.html b/user_guide/overview/goals.html
index 537ac05..c7f347a 100644
--- a/user_guide/overview/goals.html
+++ b/user_guide/overview/goals.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/overview/index.html b/user_guide/overview/index.html
index 59ade97..9564790 100644
--- a/user_guide/overview/index.html
+++ b/user_guide/overview/index.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/overview/mvc.html b/user_guide/overview/mvc.html
index 60b006c..bba6188 100644
--- a/user_guide/overview/mvc.html
+++ b/user_guide/overview/mvc.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('../userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
 
-<script type="text/javascript" src="../scripts/nav.js"></script>
+<script type="text/javascript" src="../nav/nav.js"></script>
 <script type="text/javascript" src="../scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="../scripts/moo.fx.js"></script>
+<script type="text/javascript" src="../nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
diff --git a/user_guide/scripts/nav.js b/user_guide/scripts/nav.js
index acc64ee..96905c8 100644
--- a/user_guide/scripts/nav.js
+++ b/user_guide/scripts/nav.js
@@ -21,6 +21,7 @@
 			'<li><a href="'+base+'installation/downloads.html">Downloading Code Igniter</a></li>' +
 			'<li><a href="'+base+'installation/index.html">Installation Instructions</a></li>' +
 			'<li><a href="'+base+'installation/upgrading.html">Upgrading from a Previous Version</a></li>' +
+			'<li><a href="'+base+'installation/troubleshooting.html">Troubleshooting</a></li>' +
 		'</ul>' +
 		
 		'<h3>Introduction</h3>' +
diff --git a/user_guide/toc.html b/user_guide/toc.html
index 849ed61..1a2ace5 100644
--- a/user_guide/toc.html
+++ b/user_guide/toc.html
@@ -7,9 +7,9 @@
 <style type='text/css' media='all'>@import url('userguide.css');</style>
 <link rel='stylesheet' type='text/css' media='all' href='userguide.css' />
 
-<script type="text/javascript" src="scripts/nav.js"></script>
+<script type="text/javascript" src="nav/nav.js"></script>
 <script type="text/javascript" src="scripts/prototype.lite.js"></script>
-<script type="text/javascript" src="scripts/moo.fx.js"></script>
+<script type="text/javascript" src="nav/moo.fx.js"></script>
 <script type="text/javascript">
 window.onload = function() {
 	myHeight = new fx.Height('nav', {duration: 400}); 
@@ -77,6 +77,7 @@
 	<li><a href="./installation/downloads.html">Downloading Code Igniter </a></li> 
 	<li><a href="./installation/index.html">Installation Instructions</a></li> 
 	<li><a href="./installation/upgrading.html">Upgrading from an Previous Version</a></li> 
+	<li><a href="./installation/troubleshooting.html">Troubleshooting</a></li> 
 </ul> 
 
 <h3>Introduction</h3> 
@@ -98,7 +99,6 @@
 	<li><a href="./general/models.html">Models</a></li> 
 	<li><a href="./general/helpers.html">Helpers</a></li> 
 	<li><a href="./general/plugins.html">Plugins</a></li> 
-	<li><a href="./general/scripts.html">Scripts</a></li> 
 	<li><a href="./general/libraries.html">Using Code Igniter Libraries</a></li> 
 	<li><a href="./general/creating_libraries.html">Creating Your Own Libraries</a></li> 
 	<li><a href="./general/core_classes.html">Creating Core Classes</a></li>
@@ -150,6 +150,7 @@
 <li><a href="./helpers/file_helper.html">File Helper</a></li> 
 <li><a href="./helpers/form_helper.html">Form Helper</a></li> 
 <li><a href="./helpers/html_helper.html">HTML Helper</a></li> 
+<li><a href="./helpers/inflector_helper.html">Inflector Helper</a></li> 
 <li><a href="./helpers/security_helper.html">Security Helper</a></li> 
 <li><a href="./helpers/string_helper.html">String Helper</a></li> 
 <li><a href="./helpers/text_helper.html">Text Helper</a></li>